Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix plaintext files encoding #106

Merged
merged 6 commits into from
Oct 19, 2020
Merged

fix plaintext files encoding #106

merged 6 commits into from
Oct 19, 2020

Conversation

HubertBalcerzak
Copy link
Collaborator

@HubertBalcerzak HubertBalcerzak commented Jun 19, 2020 •
edited
Loading

@HubertBalcerzak HubertBalcerzak added bug Something isn't working enhancement New feature or request labels Jun 19, 2020
@HubertBalcerzak HubertBalcerzak added this to the 1.1 milestone Jun 19, 2020
@HubertBalcerzak HubertBalcerzak linked an issue Jun 19, 2020 that may be closed by this pull request
Missing default encoding #92
Closed
@HubertBalcerzak HubertBalcerzak changed the title fix encoding for pastes fix plaintext files encoding Jun 19, 2020
@HubertBalcerzak
Copy link
Collaborator Author

@Kuboczoch the last part is on you

@HubertBalcerzak HubertBalcerzak changed the base branch from 1.1 to develop June 25, 2020 20:41
@Kuboczoch Kuboczoch linked an issue Sep 11, 2020 that may be closed by this pull request
List of encodings #154
Open
@Kuboczoch Kuboczoch self-assigned this Sep 11, 2020
@Kuboczoch
Copy link
Member

Kuboczoch commented Sep 30, 2020 •
edited
Loading

I don't think that support for uploading files with specific encoding should be in this PR.
Issue #154 is far more complicated than work done in here.

Replaced issue #154 with #156
Replaced with #157

@Kuboczoch Kuboczoch removed a link to an issue Sep 30, 2020
List of encodings #154
Open
@Kuboczoch Kuboczoch linked an issue Sep 30, 2020 that may be closed by this pull request
Specify content type from file #156
Closed
@Kuboczoch Kuboczoch removed a link to an issue Sep 30, 2020
Specify content type from file #156
Closed
@Kuboczoch Kuboczoch linked an issue Sep 30, 2020 that may be closed by this pull request
Specify file encoding #157
Closed
@HubertBalcerzak
Merge branch 'develop' into fix/plaintext-encoding
cfbdae3 
# Conflicts:
#	gatsby-app/src/components/useFileUpload.js
#	spring-app/src/test/kotlin/pl/starchasers/up/controller/UploadControllerTest.kt
@HubertBalcerzak
charset guessing
6b381de
@HubertBalcerzak
test adjustments
3691fc8
@HubertBalcerzak HubertBalcerzak marked this pull request as ready for review October 16, 2020 01:18
@HubertBalcerzak HubertBalcerzak merged commit d590f03 into develop Oct 19, 2020
@HubertBalcerzak HubertBalcerzak deleted the fix/plaintext-encoding branch October 19, 2020 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KocproZ KocproZ KocproZ approved these changes

Assignees

@HubertBalcerzak HubertBalcerzak

Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Milestone
1.2 (legacy)
Development

Successfully merging this pull request may close these issues.

Specify file encoding Missing default encoding
3 participants
@HubertBalcerzak @Kuboczoch @KocproZ